y file-code code-view code-diff">

+ 82 - 0
simditor/static/simditor/fonts/selection.json

@@ -0,0 +1,82 @@
1
+{
2
+	"IcoMoonType": "selection",
3
+	"icons": [
4
+		{
5
+			"icon": {
6
+				"paths": [
7
+					"M877.248 786.752l-146.752-146.752-90.496 90.496 146.752 146.752-146.752 146.752h384v-384zM384 0h-384v384l146.752-146.752 145.376 145.248 90.496-90.496-145.376-145.248zM384 730.496l-90.496-90.496-146.752 146.752-146.752-146.752v384h384l-146.752-146.752zM1024 0h-384l146.752 146.752-145.376 145.248 90.496 90.496 145.376-145.248 146.752 146.752z"
8
+				],
9
+				"tags": [
10
+					"fullscreen",
11
+					"expand"
12
+				],
13
+				"grid": 16,
14
+				"attrs": []
15
+			},
16
+			"attrs": [],
17
+			"properties": {
18
+				"id": 99,
19
+				"order": 2,
20
+				"prevSize": 16,
21
+				"code": 58880,
22
+				"name": "fullscreen"
23
+			},
24
+			"setIdx": 1,
25
+			"setId": 6,
26
+			"iconIdx": 99
27
+		}
28
+	],
29
+	"height": 1024,
30
+	"metadata": {
31
+		"name": "icomoon"
32
+	},
33
+	"preferences": {
34
+		"fontPref": {
35
+			"prefix": "icon-",
36
+			"metadata": {
37
+				"fontFamily": "icomoon",
38
+				"majorVersion": 1,
39
+				"minorVersion": 0
40
+			},
41
+			"showGlyphs": true,
42
+			"metrics": {
43
+				"emSize": 512,
44
+				"baseline": 6.25,
45
+				"whitespace": 50
46
+			},
47
+			"resetPoint": 58880,
48
+			"showQuickUse": true,
49
+			"quickUsageToken": false,
50
+			"showMetrics": false,
51
+			"showMetadata": false,
52
+			"autoHost": true,
53
+			"embed": false,
54
+			"ie7": false,
55
+			"showSelector": false,
56
+			"showVersion": true
57
+		},
58
+		"imagePref": {
59
+			"color": 0,
60
+			"height": 32,
61
+			"columns": 16,
62
+			"margin": 16,
63
+			"png": false,
64
+			"sprites": true,
65
+			"prefix": "icon-"
66
+		},
67
+		"historySize": 100,
68
+		"showCodes": true,
69
+		"gridSize": 16,
70
+		"showLiga": false,
71
+		"showGrid": true,
72
+		"showGlyphs": true,
73
+		"showQuickUse": true,
74
+		"search": "",
75
+		"quickUsageToken": {
76
+			"UntitledProject1": "ZWEwOTk2NTRmNjMyOGQ1MzAwZWFiYmJlODViMWMzZDcjMiMxNDA3NzM0MTA2IyMj"
77
+		},
78
+		"showQuickUse2": true,
79
+		"showSVGs": true,
80
+		"fontHostingName": false
81
+	}
82
+}

BIN
simditor/static/simditor/images/emoji/+1.png


BIN
simditor/static/simditor/images/emoji/-1.png


BIN
simditor/static/simditor/images/emoji/100.png


BIN
simditor/static/simditor/images/emoji/109.png


BIN
simditor/static/simditor/images/emoji/1234.png


BIN
simditor/static/simditor/images/emoji/a.png


BIN
simditor/static/simditor/images/emoji/ab.png


BIN
simditor/static/simditor/images/emoji/abc.png


BIN
simditor/static/simditor/images/emoji/abcd.png


BIN
simditor/static/simditor/images/emoji/accept.png


BIN
simditor/static/simditor/images/emoji/aerial_tramway.png


BIN
simditor/static/simditor/images/emoji/airplane.png


BIN
simditor/static/simditor/images/emoji/alarm_clock.png


BIN
simditor/static/simditor/images/emoji/alien.png


BIN
simditor/static/simditor/images/emoji/ambulance.png


BIN
simditor/static/simditor/images/emoji/anchor.png


BIN
simditor/static/simditor/images/emoji/angel.png


BIN
simditor/static/simditor/images/emoji/anger.png


BIN
simditor/static/simditor/images/emoji/angry.png


BIN
simditor/static/simditor/images/emoji/anguished.png


BIN
simditor/static/simditor/images/emoji/ant.png


BIN
simditor/static/simditor/images/emoji/apple.png


BIN
simditor/static/simditor/images/emoji/aquarius.png


BIN
simditor/static/simditor/images/emoji/aries.png


BIN
simditor/static/simditor/images/emoji/arrow_backward.png


BIN
simditor/static/simditor/images/emoji/arrow_double_down.png


BIN
simditor/static/simditor/images/emoji/arrow_double_up.png


BIN
simditor/static/simditor/images/emoji/arrow_down.png


BIN
simditor/static/simditor/images/emoji/arrow_down_small.png


BIN
simditor/static/simditor/images/emoji/arrow_forward.png


BIN
simditor/static/simditor/images/emoji/arrow_heading_down.png


BIN
simditor/static/simditor/images/emoji/arrow_heading_up.png


BIN
simditor/static/simditor/images/emoji/arrow_left.png


BIN
simditor/static/simditor/images/emoji/arrow_lower_left.png


BIN
simditor/static/simditor/images/emoji/arrow_lower_right.png


BIN
simditor/static/simditor/images/emoji/arrow_right.png


BIN
simditor/static/simditor/images/emoji/arrow_right_hook.png


BIN
simditor/static/simditor/images/emoji/arrow_up.png


BIN
simditor/static/simditor/images/emoji/arrow_up_down.png


BIN
simditor/static/simditor/images/emoji/arrow_up_small.png


BIN
simditor/static/simditor/images/emoji/arrow_upper_left.png


BIN
simditor/static/simditor/images/emoji/arrow_upper_right.png


BIN
simditor/static/simditor/images/emoji/arrows_clockwise.png


BIN
simditor/static/simditor/images/emoji/arrows_counterclockwise.png


BIN
simditor/static/simditor/images/emoji/art.png


BIN
simditor/static/simditor/images/emoji/articulated_lorry.png


BIN
simditor/static/simditor/images/emoji/astonished.png


BIN
simditor/static/simditor/images/emoji/atm.png


BIN
simditor/static/simditor/images/emoji/b.png


BIN
simditor/static/simditor/images/emoji/baby.png


BIN
simditor/static/simditor/images/emoji/baby_bottle.png


BIN
simditor/static/simditor/images/emoji/baby_chick.png


BIN
simditor/static/simditor/images/emoji/baby_symbol.png


BIN
simditor/static/simditor/images/emoji/baggage_claim.png


BIN
simditor/static/simditor/images/emoji/balloon.png


BIN
simditor/static/simditor/images/emoji/ballot_box_with_check.png


BIN
simditor/static/simditor/images/emoji/bamboo.png


BIN
simditor/static/simditor/images/emoji/banana.png


BIN
simditor/static/simditor/images/emoji/bangbang.png


BIN
simditor/static/simditor/images/emoji/bank.png


BIN
simditor/static/simditor/images/emoji/bar_chart.png


BIN
simditor/static/simditor/images/emoji/barber.png


BIN
simditor/static/simditor/images/emoji/baseball.png


BIN
simditor/static/simditor/images/emoji/basketball.png


BIN
simditor/static/simditor/images/emoji/bath.png


BIN
simditor/static/simditor/images/emoji/bathtub.png


BIN
simditor/static/simditor/images/emoji/battery.png


BIN
simditor/static/simditor/images/emoji/bear.png


BIN
simditor/static/simditor/images/emoji/beer.png


BIN
simditor/static/simditor/images/emoji/beers.png


BIN
simditor/static/simditor/images/emoji/beetle.png


BIN
simditor/static/simditor/images/emoji/beginner.png


BIN
simditor/static/simditor/images/emoji/bell.png


BIN
simditor/static/simditor/images/emoji/bento.png


BIN
simditor/static/simditor/images/emoji/bicyclist.png


BIN
simditor/static/simditor/images/emoji/bike.png


BIN
simditor/static/simditor/images/emoji/bikini.png


BIN
simditor/static/simditor/images/emoji/bird.png


BIN
simditor/static/simditor/images/emoji/birthday.png


BIN
simditor/static/simditor/images/emoji/black_circle.png


BIN
simditor/static/simditor/images/emoji/black_joker.png


BIN
simditor/static/simditor/images/emoji/black_nib.png


BIN
simditor/static/simditor/images/emoji/black_square.png


BIN
simditor/static/simditor/images/emoji/black_square_button.png


BIN
simditor/static/simditor/images/emoji/blossom.png


BIN
simditor/static/simditor/images/emoji/blowfish.png


BIN
simditor/static/simditor/images/emoji/blue_book.png


BIN
simditor/static/simditor/images/emoji/blue_car.png


BIN
simditor/static/simditor/images/emoji/blue_heart.png


BIN
simditor/static/simditor/images/emoji/blush.png


BIN
simditor/static/simditor/images/emoji/boar.png


BIN
simditor/static/simditor/images/emoji/boat.png


BIN
simditor/static/simditor/images/emoji/bomb.png


BIN
simditor/static/simditor/images/emoji/book.png


BIN
simditor/static/simditor/images/emoji/bookmark.png


BIN
simditor/static/simditor/images/emoji/bookmark_tabs.png


BIN
simditor/static/simditor/images/emoji/books.png


BIN
simditor/static/simditor/images/emoji/boom.png


BIN
simditor/static/simditor/images/emoji/boot.png


BIN
simditor/static/simditor/images/emoji/bouquet.png


BIN
simditor/static/simditor/images/emoji/bow.png


BIN
simditor/static/simditor/images/emoji/bowling.png


BIN
simditor/static/simditor/images/emoji/bowtie.png


BIN
simditor/static/simditor/images/emoji/boy.png


BIN
simditor/static/simditor/images/emoji/bread.png


BIN
simditor/static/simditor/images/emoji/bride_with_veil.png


BIN
simditor/static/simditor/images/emoji/bridge_at_night.png


BIN
simditor/static/simditor/images/emoji/briefcase.png


BIN
simditor/static/simditor/images/emoji/broken_heart.png


BIN
simditor/static/simditor/images/emoji/bug.png


BIN
simditor/static/simditor/images/emoji/bulb.png


BIN
simditor/static/simditor/images/emoji/bullettrain_front.png


BIN
simditor/static/simditor/images/emoji/bullettrain_side.png


BIN
simditor/static/simditor/images/emoji/bus.png


BIN
simditor/static/simditor/images/emoji/busstop.png


BIN
simditor/static/simditor/images/emoji/bust_in_silhouette.png


BIN
simditor/static/simditor/images/emoji/busts_in_silhouette.png


BIN
simditor/static/simditor/images/emoji/cactus.png


BIN
simditor/static/simditor/images/emoji/cake.png


BIN
simditor/static/simditor/images/emoji/calendar.png


BIN
simditor/static/simditor/images/emoji/calling.png


BIN
simditor/static/simditor/images/emoji/camel.png


BIN
simditor/static/simditor/images/emoji/camera.png


BIN
simditor/static/simditor/images/emoji/cancer.png


BIN
simditor/static/simditor/images/emoji/candy.png


BIN
simditor/static/simditor/images/emoji/capital_abcd.png


BIN
simditor/static/simditor/images/emoji/capricorn.png


BIN
simditor/static/simditor/images/emoji/car.png


BIN
simditor/static/simditor/images/emoji/card_index.png


BIN
simditor/static/simditor/images/emoji/carousel_horse.png


BIN
simditor/static/simditor/images/emoji/cat.png


BIN
simditor/static/simditor/images/emoji/cat2.png


BIN
simditor/static/simditor/images/emoji/cd.png


BIN
simditor/static/simditor/images/emoji/chart.png


BIN
simditor/static/simditor/images/emoji/chart_with_downwards_trend.png


BIN
simditor/static/simditor/images/emoji/chart_with_upwards_trend.png


BIN
simditor/static/simditor/images/emoji/checkered_flag.png


BIN
simditor/static/simditor/images/emoji/cherries.png


BIN
simditor/static/simditor/images/emoji/cherry_blossom.png


BIN
simditor/static/simditor/images/emoji/chestnut.png


BIN
simditor/static/simditor/images/emoji/chicken.png


BIN
simditor/static/simditor/images/emoji/children_crossing.png


BIN
simditor/static/simditor/images/emoji/chocolate_bar.png


BIN
simditor/static/simditor/images/emoji/christmas_tree.png


BIN
simditor/static/simditor/images/emoji/church.png


BIN
simditor/static/simditor/images/emoji/cinema.png


BIN
simditor/static/simditor/images/emoji/circus_tent.png


BIN
simditor/static/simditor/images/emoji/city_sunrise.png


BIN
simditor/static/simditor/images/emoji/city_sunset.png


BIN
simditor/static/simditor/images/emoji/cl.png


BIN
simditor/static/simditor/images/emoji/clap.png


BIN
simditor/static/simditor/images/emoji/clapper.png


BIN
simditor/static/simditor/images/emoji/clipboard.png


BIN
simditor/static/simditor/images/emoji/clock1.png


BIN
simditor/static/simditor/images/emoji/clock10.png


BIN
simditor/static/simditor/images/emoji/clock1030.png


BIN
simditor/static/simditor/images/emoji/clock11.png


BIN
simditor/static/simditor/images/emoji/clock1130.png


BIN
simditor/static/simditor/images/emoji/clock12.png


BIN
simditor/static/simditor/images/emoji/clock1230.png


BIN
simditor/static/simditor/images/emoji/clock130.png


BIN
simditor/static/simditor/images/emoji/clock2.png


BIN
simditor/static/simditor/images/emoji/clock230.png


BIN
simditor/static/simditor/images/emoji/clock3.png


BIN
simditor/static/simditor/images/emoji/clock330.png


BIN
simditor/static/simditor/images/emoji/clock4.png


BIN
simditor/static/simditor/images/emoji/clock430.png


BIN
simditor/static/simditor/images/emoji/clock5.png


BIN
simditor/static/simditor/images/emoji/clock530.png


BIN
simditor/static/simditor/images/emoji/clock6.png


BIN
simditor/static/simditor/images/emoji/clock630.png


BIN
simditor/static/simditor/images/emoji/clock7.png


BIN
simditor/static/simditor/images/emoji/clock730.png


BIN
simditor/static/simditor/images/emoji/clock8.png


BIN
simditor/static/simditor/images/emoji/clock830.png


BIN
simditor/static/simditor/images/emoji/clock9.png


BIN
simditor/static/simditor/images/emoji/clock930.png


BIN
simditor/static/simditor/images/emoji/closed_book.png


BIN
simditor/static/simditor/images/emoji/closed_lock_with_key.png


BIN
simditor/static/simditor/images/emoji/closed_umbrella.png


BIN
simditor/static/simditor/images/emoji/cloud.png


BIN
simditor/static/simditor/images/emoji/clubs.png


BIN
simditor/static/simditor/images/emoji/cn.png


BIN
simditor/static/simditor/images/emoji/cocktail.png


BIN
simditor/static/simditor/images/emoji/coffee.png


BIN
simditor/static/simditor/images/emoji/cold_sweat.png


BIN
simditor/static/simditor/images/emoji/collision.png


BIN
simditor/static/simditor/images/emoji/computer.png


BIN
simditor/static/simditor/images/emoji/confetti_ball.png


BIN
simditor/static/simditor/images/emoji/confounded.png


BIN
simditor/static/simditor/images/emoji/confused.png


BIN
simditor/static/simditor/images/emoji/congratulations.png


BIN
simditor/static/simditor/images/emoji/construction.png


BIN
simditor/static/simditor/images/emoji/construction_worker.png


BIN
simditor/static/simditor/images/emoji/convenience_store.png


BIN
simditor/static/simditor/images/emoji/cookie.png


BIN
simditor/static/simditor/images/emoji/cool.png


BIN
simditor/static/simditor/images/emoji/cop.png


BIN
simditor/static/simditor/images/emoji/copyright.png


BIN
simditor/static/simditor/images/emoji/corn.png


BIN
simditor/static/simditor/images/emoji/couple.png


BIN
simditor/static/simditor/images/emoji/couple_with_heart.png


BIN
simditor/static/simditor/images/emoji/couplekiss.png


BIN
simditor/static/simditor/images/emoji/cow.png


BIN
simditor/static/simditor/images/emoji/cow2.png


BIN
simditor/static/simditor/images/emoji/credit_card.png


BIN
simditor/static/simditor/images/emoji/crocodile.png


BIN
simditor/static/simditor/images/emoji/crossed_flags.png


BIN
simditor/static/simditor/images/emoji/crown.png


BIN
simditor/static/simditor/images/emoji/cry.png


BIN
simditor/static/simditor/images/emoji/crying_cat_face.png


BIN
simditor/static/simditor/images/emoji/crystal_ball.png


BIN
simditor/static/simditor/images/emoji/cupid.png


BIN
simditor/static/simditor/images/emoji/curly_loop.png


BIN
simditor/static/simditor/images/emoji/currency_exchange.png


BIN
simditor/static/simditor/images/emoji/curry.png


BIN
simditor/static/simditor/images/emoji/custard.png


BIN
simditor/static/simditor/images/emoji/customs.png


BIN
simditor/static/simditor/images/emoji/cyclone.png


BIN
simditor/static/simditor/images/emoji/dancer.png


BIN
simditor/static/simditor/images/emoji/dancers.png


BIN
simditor/static/simditor/images/emoji/dango.png


BIN
simditor/static/simditor/images/emoji/dart.png


BIN
simditor/static/simditor/images/emoji/dash.png


BIN
simditor/static/simditor/images/emoji/date.png


BIN
simditor/static/simditor/images/emoji/de.png


BIN
simditor/static/simditor/images/emoji/deciduous_tree.png


BIN
simditor/static/simditor/images/emoji/department_store.png


BIN
simditor/static/simditor/images/emoji/diamond_shape_with_a_dot_inside.png


BIN
simditor/static/simditor/images/emoji/diamonds.png


BIN
simditor/static/simditor/images/emoji/disappointed.png


BIN
simditor/static/simditor/images/emoji/dizzy.png


BIN
simditor/static/simditor/images/emoji/dizzy_face.png


BIN
simditor/static/simditor/images/emoji/do_not_litter.png


BIN
simditor/static/simditor/images/emoji/dog.png


BIN
simditor/static/simditor/images/emoji/dog2.png


BIN
simditor/static/simditor/images/emoji/dollar.png


BIN
simditor/static/simditor/images/emoji/dolls.png


BIN
simditor/static/simditor/images/emoji/dolphin.png


BIN
simditor/static/simditor/images/emoji/door.png


BIN
simditor/static/simditor/images/emoji/doughnut.png


BIN
simditor/static/simditor/images/emoji/dragon.png


BIN
simditor/static/simditor/images/emoji/dragon_face.png


BIN
simditor/static/simditor/images/emoji/dress.png


BIN
simditor/static/simditor/images/emoji/dromedary_camel.png


BIN
simditor/static/simditor/images/emoji/droplet.png


BIN
simditor/static/simditor/images/emoji/dvd.png


BIN
simditor/static/simditor/images/emoji/e-mail.png


BIN
simditor/static/simditor/images/emoji/ear.png


BIN
simditor/static/simditor/images/emoji/ear_of_rice.png


BIN
simditor/static/simditor/images/emoji/earth_africa.png


BIN
simditor/static/simditor/images/emoji/earth_americas.png


BIN
simditor/static/simditor/images/emoji/earth_asia.png


BIN
simditor/static/simditor/images/emoji/egg.png


BIN
simditor/static/simditor/images/emoji/eggplant.png


BIN
simditor/static/simditor/images/emoji/eight.png


BIN
simditor/static/simditor/images/emoji/eight_pointed_black_star.png


BIN
simditor/static/simditor/images/emoji/eight_spoked_asterisk.png


BIN
simditor/static/simditor/images/emoji/eightball.png


BIN
simditor/static/simditor/images/emoji/electric_plug.png


BIN
simditor/static/simditor/images/emoji/elephant.png


BIN
simditor/static/simditor/images/emoji/email.png


+ 0 - 0
simditor/static/simditor/images/emoji/emojify.css

@@ -0,0 +1 @@

add api message_delete_api/message_type_delete_api · c8d93d6339 - Gogs: Go Git Service

add api message_delete_api/message_type_delete_api

Brightcells 10 years ago
parent
commit
c8d93d6339
2 changed files with 26 additions and 7 deletions
  1. 2 0
      api/urls.py
  2. 24 7
      message/views.py

+ 2 - 0
api/urls.py

@@ -50,6 +50,8 @@ urlpatterns += [
50 50
     url(r'^msg/list$', message_views.message_list_api, name='message_list_api'),  # 消息列表
51 51
     url(r'^msg/list/(?P<msg_type>\w+)$', message_views.message_type_list_api, name='message_type_list_api'),  # 分类消息列表
52 52
     url(r'^msg/read$', message_views.message_read_api, name='message_read_api'),  # 消息读取
53
+    url(r'^msg/delete$', message_views.message_delete_api, name='message_delete_api'),  # 消息删除
54
+    url(r'^msg/delete/(?P<msg_type>\w+)$', message_views.message_delete_api, name='message_type_delete_api'),  # 消息删除
53 55
 ]
54 56
 
55 57
 # 控制器相关

+ 24 - 7
message/views.py

@@ -26,6 +26,7 @@ def message_list_api(request):
26 26
         type_messages = UserMessageInfo.objects.filter(
27 27
             to_uid=user_id,
28 28
             msg_type=message['msg_type'],
29
+            status=True,
29 30
         ).order_by(
30 31
             '-pk'
31 32
         )[:settings.MESSAGE_NUM_PER_PAGE]
@@ -56,6 +57,7 @@ def message_type_list_api(request, msg_type):
56 57
     type_messages = UserMessageInfo.objects.filter(
57 58
         to_uid=user_id,
58 59
         msg_type=msg_type,
60
+        status=True,
59 61
     ).order_by(
60 62
         '-pk'
61 63
     )
@@ -81,15 +83,30 @@ def message_read_api(request):
81 83
     pk = int(request.POST.get('pk', 0) or request.GET.get('pk', 0) or -1)
82 84
     user_id = request.POST.get('user_id', '') or request.GET.get('user_id', '')
83 85
 
84
-    try:
85
-        message = UserMessageInfo.objects.get(pk=pk, to_uid=user_id)
86
-    except UserMessageInfo.DoesNotExist:
87
-        return response(MessageStatusCode.MESSAGE_NOT_FOUND)
88
-
89
-    message.read = True
90
-    message.save()
86
+    UserMessageInfo.objects.filter(pk=pk, to_uid=user_id).update(read=True)
91 87
 
92 88
     return JsonResponse({
93 89
         'status': 200,
94 90
         'message': u'已读消息成功',
95 91
     })
92
+
93
+
94
+def message_delete_api(request, msg_type=None):
95
+    """
96
+    消息删除
97
+    :param request:
98
+    :param msg_type:
99
+    :return:
100
+    """
101
+    user_id = request.POST.get('user_id', '') or request.GET.get('user_id', '')
102
+
103
+    if msg_type:
104
+        UserMessageInfo.objects.filter(to_uid=user_id, msg_type=msg_type).update(status=False)
105
+    else:
106
+        pk = int(request.POST.get('pk', 0) or request.GET.get('pk', 0) or -1)
107
+        UserMessageInfo.objects.filter(pk=pk, to_uid=user_id).update(status=False)
108
+
109
+    return JsonResponse({
110
+        'status': 200,
111
+        'message': u'消息删除成功',
112
+    })